Merge pull request #927 from JaKooLit/development

Merge Development to main branch for release 

1 files changed, 15 insertions, 11 deletions

diff --git a/config/waybar/style/[WALLUST] ML4W-modern-mixed.css b/config/waybar/style/[WALLUST] ML4W-modern-mixed.css
index f1b64745..ce4faff8 100644
--- a/config/waybar/style/[WALLUST] ML4W-modern-mixed.css
+++ b/config/waybar/style/[WALLUST] ML4W-modern-mixed.css
@@ -4,14 +4,14 @@
 @import '../../.config/waybar/wallust/colors-waybar.css';
 
 @define-color backgroundlight @color12;
-@define-color backgrounddark #FFFFFF;
+@define-color backgrounddark @background;
 @define-color workspacesbackground1 @color12;
-@define-color workspacesbackground2 #FFFFFF;
+@define-color workspacesbackground2 @background;
 @define-color bordercolor @color11;
-@define-color textcolor1 @color12;
-@define-color textcolor2 #FFFFFF;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor #FFFFFF;
+@define-color textcolor1 @foreground;
+@define-color textcolor2 @background;
+@define-color textcolor3 @foreground;
+@define-color iconcolor @foreground;
 
 * {
 	font-family: "JetBrainsMono Nerd Font";
@@ -25,7 +25,7 @@
 
 window#waybar {
     background-color: rgba(0,0,0,0.8);
-    border-bottom: 0px solid #ffffff;
+border-bottom: 0px solid @foreground;
     /* color: #FFFFFF; */
     background: transparent;
     transition-property: background-color;
@@ -139,6 +139,7 @@ window#waybar.empty #window {
 #wireplumber,
 #workspaces,
 #custom-backlight,
+#custom-nightlight,
 #custom-browser,
 #custom-cava_mviz,
 #custom-cycle_wall,
@@ -147,6 +148,7 @@ window#waybar.empty #window {
 #custom-keybinds,
 #custom-keyboard,
 #custom-light_dark,
+#custom-nightlight,
 #custom-lock,
 #custom-hint,
 #custom-hypridle,
@@ -191,6 +193,7 @@ window#waybar.empty #window {
     font-weight: bold;
     opacity: 0.8;
     color: @iconcolor;
+    border-bottom: 0px solid @foreground;
 }
 
 #idle_inhibitor.activated {
@@ -199,6 +202,7 @@ window#waybar.empty #window {
     font-weight: bold;
     opacity: 0.8;
     color: #dc2f2f;
+    border-bottom: 0px solid @foreground;
 }
 
 #custom-menu {
@@ -241,12 +245,12 @@ window#waybar.empty #window {
 }
 
 #custom-updates.yellow {
-    background-color: #ff9a3c;
-    color: #FFFFFF;
+background-color: @color11;
+color: @foreground;
 }
 
 #custom-updates.red {
-    background-color: #dc2f2f;
+background-color: @color13;
     color: #FFFFFF;
 }
 
@@ -344,7 +348,7 @@ window#waybar.empty #window {
 }
 
 #battery.critical:not(.charging) {
-    background-color: #f53c3c;
+background-color: @color13;
     color: @textcolor3;
 	animation-name: blink;
 	animation-duration: 3.0s;